Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 19:12:06 +0000 (11:12 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Jan 2012 19:12:06 +0000 (11:12 -0800)
commit49753e8110baff95ef13e70ef897dc57014fa259
tree9041bb0259686cb7d1ac20de162d6565cbc47a0f
parentb2e6753acc23459c2d1839a88c4a3bfc29fbbdd4
parent44a3bfe06a95a75a40cab5138870ea57eb78170e
Merge from trunk.